Curt Archer restores TPO track handler.

diff --git a/gpsbabel/readme.xml b/gpsbabel/readme.xml
index 10b7c10632f2ef3a6fde5090fb0bc109f5e49dd4..7994b74d9d6f1ceae5c522f4aa296c065d2e4f54 100644 (file)
--- a/gpsbabel/readme.xml
+++ b/gpsbabel/readme.xml
@@ -1530,9 +1530,9 @@ the same name (not including the extension) as the .ov2 file.
        <subtitle>National Geographic Topo Waypoint format.</subtitle>
       </sectioninfo>
       <title>TPG</title>
-      <para>National Geographic Topo! Waypoint Format.  This filter
+      <para>National Geographic Topo! Waypoint and Route Format.  This module
 reads and writes .TPG files created by various editions of NG Topo!
-This filter will *not* work with the newer combined .TPO files.
+Reading/writing of route data is not supported yet. This filter will *not* work with the newer combined .TPO files.
 Contributed by Alex Mottram.</para>
       <para>The option 'datum="datum name"' can be used to override
 the default of NAD27 ("N. America 1927 mean") which is correct for the
@@ -1540,6 +1540,31 @@ continental U.S. Points in Hawaii should use "Old
 Hawaiian_mean"</para>
       <para>Contributed by Alex Mottram.</para>
     </section>
+   <section id="tpo">
+       <sectioninfo>
+         <subtitle>National Geographic Topo! Track Format.</subtitle>
+       </sectioninfo>
+       <title>TPO</title>
+       <para>This module reads and writes
+    .TPO files created by various editions of NG Topo! version 2.7.7 or
+    earlier. This format will *not* work with the newer .TPO files
+    (version 3.0 and later) that have the TPG data combined into them.</para>
+       <para>When writing TPO files, note that every TOPO! state edition 
+       employs a slightly different data format, so you will need to 
+       specify which state edition to generate output for.  The current 
+       supported states are CA, NY, NJ, MA, CT, RI, NH, VT, ME. It's 
+       fairly easy to add support for additional states. Instructions are 
+       in the source code.</para>
+      <para>   Additional Options: </para>
+        <para>
+         <option>dumpheader</option> (0/1)  Display the file header bytes (useful when adding support for a new state)
+       </para>
+        <para>
+         <option>state</option>  State map format to write, default=CA.
+       </para>
+       <para>Contributed by Steve Chamberlin.</para>
+
+   </section>
        <section id="unicsv">
        <sectioninfo>
          <subtitle>Universal csv with field structure in first line.</subtitle>

diff --git a/gpsbabel/reference/track/sample1.gpx b/gpsbabel/reference/track/sample1.gpx
index 8d0e55fbaeae19f8079f5b74c8af44f85637f904..1fa2656658d918add323a4f1e316ec9cce554f41 100644 (file)
--- a/gpsbabel/reference/track/sample1.gpx
+++ b/gpsbabel/reference/track/sample1.gpx
@@ -6,6 +6,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
 <time>1970-01-01T00:00:00Z</time>
+<bounds minlat="33.753026015" minlon ="-122.443458941" maxlat="41.447125389" maxlon="-116.669656846" />
 <trk>
   <name>Track 1</name>
 <trkseg>

diff --git a/gpsbabel/reference/track/sample2.tpo b/gpsbabel/reference/track/sample2.tpo
index d0b0e1a4bae48b37951a2cd41216fe6c3d1102ae..ab7556c2884125ae23f8d3a84375b30706545a33 100644 (file)
Binary files a/gpsbabel/reference/track/sample2.tpo and b/gpsbabel/reference/track/sample2.tpo differ

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 169c6245fcf3292fcd46c21a22a805d7ac178e4b..6b04de348fd37211ab2c004462b69032923c8056 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -200,6 +200,17 @@ ${PNAME} -i tpg -f ${TMPDIR}/geo.tpg -o mxf -F ${TMPDIR}/tpg.mxf
 ${PNAME} -i tpg -f reference/tpg.tpg -o mxf -F ${TMPDIR}/topo.mxf
 compare ${TMPDIR}/tpg.mxf ${TMPDIR}/topo.mxf
 
+# TPO (NG Topo!) file format
+# This is hard to test as the datum conversions create minute
+# inconsistencies in the coordinates. We have four reference files:
+# sample1.tpo, sample1.gpx, sample2.gpx, and sample2.tpo.  These are
+# used to check the conversion to/from TPO format.
+rm -f ${TMPDIR}/sample1.gpx ${TMPDIR}/sample2.tpo
+${PNAME} -t -i tpo -f reference/track/sample1.tpo -o gpx -F ${TMPDIR}/sample1.gpx
+compare ${TMPDIR}/sample1.gpx reference/track/sample1.gpx
+${PNAME} -t -i gpx -f reference/track/sample2.gpx -o tpo -F ${TMPDIR}/sample2.tpo
+bincompare ${TMPDIR}/sample2.tpo reference/track/sample2.tpo
+
 # OZI (OziExplorer 1.1) file format
 rm -f ${TMPDIR}/oz.wpt ${TMPDIR}/ozi.wpt
 ${PNAME} -i ozi -f reference/ozi.wpt -o ozi -F ${TMPDIR}/oz.wpt